-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Split military outposts and bunkers #48697
Merged
ZhilkinSerg
merged 463 commits into
CleverRaven:0.F-dev
from
krulunio:krulunio-basecamps
Jun 2, 2021
Merged
Split military outposts and bunkers #48697
ZhilkinSerg
merged 463 commits into
CleverRaven:0.F-dev
from
krulunio:krulunio-basecamps
Jun 2, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
actual-nh
added
0.F Content Freeze
[JSON]
Changes (can be) made in JSON
Map / Mapgen
Overmap, Mapgen, Map extras, Map display
labels
Apr 29, 2021
* Initial check for static int_ids int_ids with static storage duration are dangerous because they can start to refer to the wrong thing when game data reloads. This has caused problems in the past. Add a check for such variables, and some tests. * Remove some static int_ids Fix issues detected by new check by replacing some static int_ids with their respective string_ids. Some were just unused, so got deleted instead. Some cases suppressed, including the furniture and terrain ids, since they were the most numerous and widely used, so that seemed the riskiest change.
…odr_violations Stop StringMaker ODR violations
Fix json formatter build and string extraction script in 0.F-dev branch
* Port code to emplace_back This is clang-tidy making automated changes to convert push_back into emplace_back whenever the argument to push_back is either a constructor call for the type in question of an expression of a type implicitly convertible to the type in question. This should eliminate one move-construction of the inserted object for each call. * Enable clang-tidy modernize-use-emplace
If you change overmap ids you need to add migration code (e.g. #41910). |
Actually, I didn't change or remove old IDs, only added new ones. |
Expansions are simple and sometimes useless, I don't know what to do with them. Upgrade paths are short, because: 1. mansions are already built, not much to add to them 2. I don't know how to properly make expansions on rotatable terrain
This adds: 1. radio tower basecamp (2 variants; allows using bottom of tower as base for shack, for faster building and less materials than normally) 2. unique upgrade: repairing whole tower (requires ~4-8 times more materials and time than building radio in field camp, fabrication 3, computer 4 and electronics 8 skills; gives access to hacking recipes) 3. hacking recipes (allows "downloading" sd-cards, various software and satelitte map; divided into 3 groups: general, science and satellite, in case someone adds i.e. lab basecamp, with only science recipes) 4. satellite map (reveals fields, forests, roads, lakes and rivers; instead of showing where is specific type of building, it shows where is any building)
Right, it was just a warning for your awareness. |
krulunio
requested review from
BrettDong,
Fris0uman,
I-am-Erk,
John-Candlebury,
KorGgenT,
Maleclypse and
Mom-Bun
as code owners
May 28, 2021 10:06
ZhilkinSerg
reviewed
May 28, 2021
ZhilkinSerg
reviewed
May 28, 2021
ZhilkinSerg
removed request for
John-Candlebury,
BrettDong,
KorGgenT,
Fris0uman,
Mom-Bun,
I-am-Erk and
Maleclypse
May 28, 2021 12:01
ZhilkinSerg
reviewed
Jun 2, 2021
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jun 14, 2021
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jun 14, 2021
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jun 14, 2021
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jun 21, 2021
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jul 3, 2021
anothersimulacrum
pushed a commit
to anothersimulacrum/Cataclysm-DDA
that referenced
this pull request
Jul 3, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
None
Additional context
I plan to add those locations as possible base camp locations, having them under same OMTs makes my plan near impossible